From d1a0239a1882075af92071550cec6aa40e01fb75 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 15 Dec 2008 16:12:09 +0000 Subject: [PATCH] Mask G_FILE_TYPE_SHORTCUT as a directory (#561494) 2008-12-15 Tomas Bzatek * gtk/gtkfilechooserdefault.c: (list_row_activated): * gtk/gtkfilesystem.c: (_gtk_file_info_consider_as_directory): Mask G_FILE_TYPE_SHORTCUT as a directory (#561494) svn path=/trunk/; revision=21906 --- ChangeLog | 6 ++++++ gtk/gtkfilechooserdefault.c | 3 ++- gtk/gtkfilesystem.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1317be763..40972e5edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-15 Tomas Bzatek + + * gtk/gtkfilechooserdefault.c: (list_row_activated): + * gtk/gtkfilesystem.c: (_gtk_file_info_consider_as_directory): + Mask G_FILE_TYPE_SHORTCUT as a directory (#561494) + 2008-12-13 Matthias Clasen * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index e7910ad08f..55c8470d8a 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -10718,7 +10718,8 @@ list_row_activated (GtkTreeView *tree_view, const gchar *target_uri; file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter); - if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE) + if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE || + g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT) { target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI); if (target_uri) diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index f4b78d4d54..549671da5a 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -1803,6 +1803,7 @@ _gtk_file_info_consider_as_directory (GFileInfo *info) GFileType type = g_file_info_get_file_type (info); return (type == G_FILE_TYPE_DIRECTORY || - type == G_FILE_TYPE_MOUNTABLE); + type == G_FILE_TYPE_MOUNTABLE || + type == G_FILE_TYPE_SHORTCUT); } -- 2.30.2